67e3d36f37d946c6f584f3b1dd730bb3ced5e764,src/com/opencms/flex/CmsJspLoader.java,CmsJspLoader,load,#CmsObject#CmsFile#HttpServletRequest#HttpServletResponse#,508

Before Change


                        // default encoding. In case another encoding is set 
                        // in the 'content-encoding' property of the file, 
                        // we need to re-encode the output here. 
                        String dnc = A_OpenCms.getDefaultEncoding().trim().toLowerCase();  
                        String enc = cms.getRequestContext().getEncoding().trim().toLowerCase();
                        if (! dnc.equals(enc)) {
                            if (DEBUG > 1) System.err.println("CmsJspLoader.load(): Encoding result from " + dnc + " to " + enc);
                            result = (new String(result, dnc)).getBytes(enc);                            
                        }
                                                                                                                              
                        // Check for export request links 

After Change


                try {      
                    if (! res.isCommitted() || m_errorPagesAreNotCommited) {
                        // If a JSP errorpage was triggered the response will be already committed here
                        byte[] result = w_res.getWriterBytes();
                        
                        // Encoding project:  
                        // The byte array will internally be encoded in the OpenCms 
                        // default encoding. In case another encoding is set 
                        // in the 'content-encoding' property of the file, 
                        // we need to re-encode the output here. 
                        result = Encoder.changeEncoding(result, A_OpenCms.getDefaultEncoding(), cms.getRequestContext().getEncoding());   
                                                                                                                              
                        // Check for export request links 
                        if (exportmode) {